From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 16 Dec 2021 05:31:48 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~4031^2~8
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e7a6d6a546e7e56e5a721aac86a19473e4303111;p=emacs.git

Merge from origin/emacs-28

1e578267fb Fix control buffer window height in 'ediff-setup-control-b...
---

e7a6d6a546e7e56e5a721aac86a19473e4303111